From 1c35a2eb5cb59ecd694f6feb2c7b4a8b1b9b507b Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Sun, 11 Oct 2020 21:34:17 +0100 Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff --- config_host.mk.in | 1 + configure.ac | Bin 483159 -> 483299 bytes solenv/gbuild/gbuild.mk | 2 ++ 3 files changed, 3 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 3bca36d136e..06bd4f8588e 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -99,6 +99,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@ export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@ export CPUNAME=@CPUNAME@ export CDEFAULTOPT=@CDEFAULTOPT@ +export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@ export CROSS_COMPILING=@CROSS_COMPILING@ export CURL=@CURL@ export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@ diff --git a/configure.ac b/configure.ac index 80926de80c160c362d6f1f08af753e68a6c55afe..4840cf59fbbc84850f8718f3947cef66247e8a64 100644 GIT binary patch delta 176 zcmcbF7M3ln++XW6(-cZli%S%AD-`rgi;MJ=GV}CP3bNC6lS(sl zQqpn~(~GSYN-|ROxD+73!!gLk)i2&TAi&MX(LLBU0Zp}nu5Nm2i2_Vs!N^WOCACaH uuQVqofh#SO%h5SLIMgXPL<4LPFTx~EF0SeK_1UG{)xNTBSNqClm<0f%f;mS3 delta 34 qcmaF7U-tSw*@hOz7N!>F7M3ln++U|B{9u)A-|&@n`-ZP<##sOd`VRsC diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 97d2879dcc9..137b6e5e9b7 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -259,6 +259,8 @@ gb_GLOBALDEFS += \ ENABLE_LTO \ ) +gb_GLOBALDEFS += $(HARDEN_CPPFLAGS) + gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) # Common environment variables passed into all gb_*Test classes: -- 2.30.2